Merge branch 'master' of git://git.denx.de/u-boot-arm
authorTom Rini <[email protected]>
Thu, 13 Nov 2014 14:32:45 +0000 (09:32 -0500)
committerTom Rini <[email protected]>
Thu, 13 Nov 2014 14:32:45 +0000 (09:32 -0500)

Trivial merge